#undef GTK_DISABLE_DEPRECATED, clean up includes a bit.

2008-06-17  Michael Natterer  <mitch@imendio.com>

	* gtk/gtktestutils.c: #undef GTK_DISABLE_DEPRECATED, clean up
	includes a bit.

	* gtk/gtkuimanager.c: #include "gtkwindow.h", it was only pulled
	in via deprecated headers.

svn path=/trunk/; revision=20416

diff --git a/ChangeLog b/ChangeLog
index 601a3569b4b910474cb8686799aee0b5a6f672cd..6731e8761fb3b8f60929b6805a8df09a737c36af 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-17  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtktestutils.c: #undef GTK_DISABLE_DEPRECATED, clean up
+       includes a bit.
+
+       * gtk/gtkuimanager.c: #include "gtkwindow.h", it was only pulled
+       in via deprecated headers.
+
 2008-06-16  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 508751 – gnome-terminal crashed with SIGSEGV after keypress

diff --git a/gtk/gtktestutils.c b/gtk/gtktestutils.c
index 10ffe484210cc65c459041d5122e35f4a3ec8433..2895f7c7b3b8b749aa459bb3f31f84a8e8380ed1 100644 (file)
--- a/gtk/gtktestutils.c
+++ b/gtk/gtktestutils.c
@@ -20,8 +20,10 @@
 
 /* need to get the prototypes of all get_type functions */
 #define GTK_ENABLE_BROKEN
+#undef GTK_DISABLE_DEPRECATED
+
+#include <config.h>
 
-#include "gtktestutils.h"
 #include <gtk/gtk.h>
 #include "gtkalias.h"
 

diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c
index 8ba5f1617a8a528d9cedf929c4f1cddc1172666f..b0d48a848f7b78561d91b9a05fc23f1cf3909763 100644 (file)
--- a/gtk/gtkuimanager.c
+++ b/gtk/gtkuimanager.c
@@ -43,6 +43,7 @@
 #include "gtktearoffmenuitem.h"
 #include "gtktoolbar.h"
 #include "gtkuimanager.h"
+#include "gtkwindow.h"
 #include "gtkprivate.h"
 #include "gtkalias.h"